Merge cherrypicks of ['googleplex-android-review.googlesource.com/23214526', 'googleplex-android-review.googlesource.com/23395489'] into tm-qpr3-release.

Change-Id: I2c2aa95c2aff1ce378b68e1376e6fdb708530fa2