DO NOT MERGE

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

Bug: 118454372
Change-Id: I986e1aeccdbf686d873f849b1a28197c33df79b6