Merge cherrypicks of ['googleplex-android-review.googlesource.com/28421207', 'googleplex-android-review.googlesource.com/28421209'] into sparse-12143574-L23000030005476973.
SPARSE_CHANGE: I5de5e88e286aea0a5d5786e7f84732f947a88449
SPARSE_CHANGE: I806654fb5cc7bb882f8e58bddf4c2cb1d31ae87e

Change-Id: I3d682f99caf0b05593b0f99bf738cd4aeeab22a2