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

Change-Id: Ibf5ae0081885d8d8d6d6de24bbf978e881486774