DO NOT MERGE

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

Bug: 120502534
Change-Id: Id28431c634778303a85eb0a93b574456c23adb30