Merge RP1A.200720.012
Change-Id: I0f872c1dc07e552e671f639f7e95d901e7d85139