Merge RP1A.200720.012
Change-Id: Ia42c6316b0caf23ac1579e6a2e8458e0f5ee7fb1