Merge RP1A.200407.001

Change-Id: I2a0ad141c1180a48716552711c485c6d52ac89fd