DO NOT MERGE

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

Bug: 120502534
Change-Id: Ibadf1cb156b2024ef2fb40e1d36e6b6440ebdfc0