Merge RP1A.200708.001
Change-Id: I6668a9cc786198e3d9c9eff8db7c6e15bb206263