DO NOT MERGE

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

Bug: 120502534
Change-Id: I7bf6e3c2c071670a387573b17ecb259a98f93732