DO NOT MERGE

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

Bug: 120502534
Change-Id: I821eb692c54a3df2457f03c58ea95a1c14d34082