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

Change-Id: Iea61654912ab1afb31757386f0aefd3f99201d0f