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

Change-Id: I3a5e1179b59f1b8f51ea30da811752057b83b39c