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

Bug: 120502534
Change-Id: Ia52654e6f224791d7a293f0dce80164ce5bcd6e0