Merge cherrypicks of ['aosp/2391480'] into sparse-8937393-L93400000958251797.
SPARSE_CHANGE: I47c38c7e3c7a9cabb6e918f8a78143553ef7928c

Change-Id: I4b85d3204ba4bd1f566c08ea6d1c640d4307b6c8