[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: 912c83a8 -s ours am: ab5d58c8 -s ours am skip reason: subject contains skip directive Change-Id: I1b402444d68dcdeb9ca91d99c4fd4e0a150e65b0
mentioned in commit 25492eca