[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 1ba1899aa2  -s ours

Change-Id: Ie0a96e75b7c51a2267b54ce10695dbb2ee03696f