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

Bug: 120502534
Change-Id: I81e7b906732f23efcb0f9b8ec0035f30e8e807d2