Merge RP1A.200504.002

Change-Id: Ic4412b3826923c44dc4c8f44dc62615a4f923787