Merge RP1A.200708.001
Change-Id: I7630091c78692dce663be2fc4ab5648dce78e3db