Merge cherrypicks of ['android-review.googlesource.com/3480990', 'android-review.googlesource.com/3480104'] into sparse-13018634-L50400030009417638.
SPARSE_CHANGE: If5970a9c0ab5e132a584092cb404ed32671e5d50
SPARSE_CHANGE: I590cb5b30f5bb2cc0b4b35e5bb332eccc1ff5a4a

Change-Id: I630b5c327dfefc9ee5cc3fedf765c87ce073e679