[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: a928c52a -s ours am: b9ad84a1 -s ours Change-Id: I31e78d7bf24cd391385d9ed1aded7505a52dbffb
mentioned in commit 85a074e6