[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: b32f10b0 -s ours am: 5e1d46a0 -s ours am skip reason: subject contains skip directive Change-Id: Ia9bcc9b29f159c3476558cf05788dc957e5ffadc
mentioned in commit 02385338