Merge "Fix bug introduced in https://android-review.googlesource.com/102610."