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

Bug: 122685541
Change-Id: I055bf866d816f6ec6e920decd7e2f414a0df3cc3