Merge RP1A.200526.001

Change-Id: Id067af1be212e6d2c23b4ab60f221221f3125151