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

Change-Id: If04c76722e7856c41ff9932970ad73617d06e720