[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: 6215402ad4  -s ours

Change-Id: I48ffb2416b19383b8e7a1015826a1e87b930e810