Merge RP1A.200608.002

Change-Id: Idd34596969cffa3652e6a12196c1208ff0b42a28