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

Bug: 120848293
Change-Id: Ie7dbf27f31546df3b3a88f119cd34880391647da