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

Change-Id: I3a6479e14c5552cbc70991c249945341c0a73f6a