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

Bug: 122685541
Change-Id: Ie45c11f01f847d11da7a3454026a3c301439627b