DO NOT MERGE

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

Bug: 120502534
Change-Id: I43eec55e7127bf70b9f209c635adbcb2f7811966