[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 20c336953f  -s ours

Change-Id: I0691ef7387fc3f13728a566f7eeae820ec64b14e