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

Change-Id: I81786efa9a194dad95d2a1ee079b1915ea26abd2