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

Bug: 120502534
Change-Id: Id4f4f66ffb8104d953957f1c44dff6f549a387bb