Merge RP1A.200515.001

Change-Id: I9a22dd7f2657ed909762a3c104ed196a0a0e43b8