DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master

Bug: 124234733
Change-Id: I7ed72a237fd7f0aa984b8077a369a1ddb5ba253b