[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 2c25fbac37 -s ours am skip reason: subject contains skip directive Change-Id: I374884d37d739e4986fb9bdad7956198a292d930