Merge cherrypicks of ['partner-android-review.googlesource.com/3014962', 'partner-android-review.googlesource.com/3016323'] into sparse-12653312-L40200030010309035.
SPARSE_CHANGE: Ie9879a34958399448043945bb91f9733ebb15fed
SPARSE_CHANGE: I1fba3020c822257fd21ba7663cc7a46da75c6cee


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