Merge RP1A.200428.001

Change-Id: Ib91d14aa3fcaa1627e3a5ebcd12ef2db407dac8d