[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: 48849e0e06 -s ours
am: 678abc1dea -s ours
am skip reason: subject contains skip directive

Change-Id: I874e20a6e87e90028906ffed512d5ee679bd87b1