Merge RP1A.190528.001

Change-Id: I4dc8de36632895418d6a3c4cb6d08ad07f625ce8