Merge RP1A.200720.012
Change-Id: I347ad796cb0c853f66700c72f0627dd9767e9944