Merge RP1A.190923.001

Change-Id: I6050e4ccb2fa18180899ac7680148f9176f6b46e