Merge RP1A.190822.001

Change-Id: I2d7a50eeaa83bf72c40c7ab8fd4a741a53838b6d