DO NOT MERGE

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

Bug: 120502534
Change-Id: I87ba88f1d2475a9b517c7d1dbf8892db9274f9f9