[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: c0487c84 -s ours am: ff6b8922 -s ours am skip reason: subject contains skip directive Change-Id: Ie3c8b184c129d3b13263bcfd70195a8d679f483e
mentioned in commit b440abc0