DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I15fa182e163cef52bbec0111280a10955054fad5