DO NOT MERGE

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

Bug: 120502534
Change-Id: I7019bc01dc64db2ee92cc9b89fc21137f73fb58a