Merge RP1A.200507.001

Change-Id: I9c41652a97aa9a63f089c19bb604e29299957960