[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: d7a07752 -s ours am: ef15b5ab -s ours Change-Id: I26c959f7fcd142e449893cc255912775bf08e492