DO NOT MERGE -- Merge PPRL.190405.003 into master

Bug: 130175407
Change-Id: I0d4cfc3362819a2d14e1247d3ffd76b5a32f2524