Merge cherrypicks of ['partner-android-review.googlesource.com/3026529', 'partner-android-review.googlesource.com/3036700'] into sparse-12859539-L51200030008761432.
SPARSE_CHANGE: I5a87a9214656db5b12c9adae4345f0ea1dd3e7d9
SPARSE_CHANGE: I674555587c2b62d484a7c3393699a471a92c1439


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