Merge RP1A.200507.001

Change-Id: Id3fe979ea3edac26e96a3b9eea5cfbca2fbb0ae4