Merge RP1A.200504.002

Change-Id: Ic724c34ede3e3aa7705e5600bce0327bc2289815