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

Change-Id: Ief59aa1bf0b6ed6fec35518e932fd824a46991e9