[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 6215402ad4  -s ours
am: 3dcc40bb6b  -s ours

Change-Id: I559b4b1361cb6b076d1fbeb1b9d4a3ec848a0252