Merge RP1A.200512.001

Change-Id: I02e5b50c9999fb508aadafc9848d91fb348ad6e4