DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into stage-aosp-master

Bug: 122685541
Change-Id: Ia1e205f952b8af840efdf5518762a57db43c6a7a