Merge RP1A.190822.001

Change-Id: I380af5a81904acbd375639caa305207158e66a47