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

Bug: 120502534
Change-Id: Idff7f2763ff7b63e279ce80d75d8aa73d078b0f5