DO NOT MERGE - Merge PPRL.190305.001 into master

Bug: 127812889
Change-Id: I1d92d0c9d3ecdbbb9643ccdd8fa7f1a8478bbce9