Merge RP1A.200511.001

Change-Id: I9c3e18d3af2e84307e2bede9b6f06d881b3721ab