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

Change-Id: I291e89a40a05cc85e24d9d51fa95872fc09be658