DO NOT MERGE Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I6e39f92bbec11d969dd583e299067bd6435b7106