Merge RP1A.200624.001
Change-Id: I530a654ad07f37e7673400c025055b03a6e8a8bb