Merge RP1A.200720.012
Change-Id: If2e804d6e08c1f6c15257f93f91303169cb0bb9e