Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102441', 'googleplex-android-review.googlesource.com/25106966'] into sparse-10978663-L86500000963621132.
SPARSE_CHANGE: I5093162cbfa632bafe6870c84177952becc82c50
SPARSE_CHANGE: Ieacc78332716aa6628d67ca3227b6995ec7bb49e

Change-Id: Id1643b6abc5be162d89c4abe386cfdfaf4a2bae7