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

Bug: 122685541
Change-Id: I74b526be47708d6f78b26eecc79cb3bbc7093a96