DO NOT MERGE - Revert "DO NOT MERGE -- Merge PPRL.190405.003 into master"

This reverts commit aed98d6663c1c020ddf6390bd6c5004cd63962c4, reversing
changes made to 987a4730999022ab67d7cd6431d02a97748a4406.

Bug: 130175407
186 files changed