[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am: b73bb94aeb  -s ours
am: e56fcb9077  -s ours

Change-Id: I1270621f214230426bf01e981285dff912ca9152