Merge RP1A.190822.001

Change-Id: I76709efff59d1a0657070a98b9668409015bb87d