Merge RP1A.200512.001

Change-Id: Ibfc13b288f89e41355b6c80fd0025f2991b458b6