[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 92e88fac -s ours am: 8bb90ac9 -s ours am: e78ee47a -s ours Change-Id: I0b68b2b36dc5e083caf8faf1b6fd36db4d9caefc