[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001, history only) into master" am: 9d587e95e2  -s ours
am: 1081965ce4  -s ours

Change-Id: I14ae22b8ab2fe817062ab3328e42ac4671c19ca6