Merge RP1A.200512.001

Change-Id: I0ace87b42f45930fa7bc471240d7408dc93f8018