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