Merge RP1A.190822.001

Change-Id: Ic5a9fb181ed92f4a0b02d0a203abc14fc55c3b48