Merge RP1A.190822.001

Change-Id: Id2498fb751f7ea5d33b8483f4a211b777d08c5c2