Merge RP1A.200708.001
Change-Id: I9ccff5422488341c5d167a409516c4ece1f9ba60