DO NOT MERGE

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

Bug: 120502534
Change-Id: I9f0a590277b2ff29fb779e189430b5b72de97f08