Merge "Follow up to https://android-review.googlesource.com/114561"