Merge RP1A.200616.001

Change-Id: I903ef34fa1229f94721ef3268ec65f94e1557585