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