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

Bug: 120502534
Change-Id: If4ddcdb16c80034ed9df4f5e9475240243515fd0