DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I2e3efc6d3e420f898e7ca1158b94b0e3df346bdc