Merge RP1A.200320.002

Change-Id: I7aaa82fb08a1c12bad35c6515ed54b5c9c569b56