Merge RP1A.200609.001

Change-Id: Ib2ecb908a02388dbc23fe4b9189122e09fe64086