Merge RP1A.200504.002

Change-Id: I4afab0e02a8735752abf68036b738b5ee5ba4302