DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Ie43343edd6addc83aa25d29d23964bc43da5d481