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

Bug: 122685541
Change-Id: Ia1bbd79cdfc5b803b292bf25635955049f7acdee