Merge RP1A.200720.012
Change-Id: I1aa153cfc8353e25e729d2885160e2ea0b63e5d7