Merge RP1A.200619.001

Change-Id: I053ad69e49d1b43d1f62e75adc37f302c79b8f0d