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

Change-Id: If02c87ee5b8bcb230ff026cec1e79df33473d617