Merge RP1A.190822.001

Change-Id: I3ca96a654ab4bc412d51f903e3ac3cf407887afe