Merge RP1A.190822.001

Change-Id: I635802d63d466b12c18e25b4e34a600b3b372d41