[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 4406dbba -s ours am: 5ff2ef43 -s ours Change-Id: I7028d32159a46c4b957ef63dc9c070122c48fe58