Merge RP1A.190822.001

Change-Id: I46f0033f768fce504dc676beff20817d55f33171