[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 565fe88676  -s ours am: a2c5eae69d  -s ours
am: 5cd61fb6ce  -s ours

Change-Id: I3595a84290f69583381a7efd108f046622f38d44