DO NOT MERGE

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

Bug: 120502534
Change-Id: Ia7fe6b6caee5de7b74936930e362dd5cda3440e8