DO NOT MERGE

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

Bug: 120502534
Change-Id: Ibb5e9c51669926ccfa8a56317a2eb2e2e15f238e