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

Bug: 122685541
Change-Id: If1bd13c44894ae38126f83f4b42a885369a9a2b2