Merge RP1A.200608.002

Change-Id: I2c82cbc93676dd87356434670393e76f5e09be47