Merge cherrypicks of ['partner-android-review.googlesource.com/2927467', 'partner-android-review.googlesource.com/2926965'] into sparse-12319158-L27000030006374856.
SPARSE_CHANGE: I213ce7fd602a692b3bd28c00638fb1e0660dedc5
SPARSE_CHANGE: Id8ea0acdb67b2c939ee622e98a5d49fe89622a51


Change-Id: I651833bf8a945bace0326793669455856a8486fe
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>