[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 69e9575116  -s ours
am: 0a2e788d17  -s ours

Change-Id: I43b6cd62f2abd355d35cb37d575f58517c2c9337