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

Bug: 122685541
Change-Id: I625bfacd8c76fbcff0a2c3836a58f3bd334221b0