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