Merge RP1A.200708.001
Change-Id: I00c33b9ac0a5ed88fb2acbbb0da40cf8d7822bef