Merge RP1A.200720.012
Change-Id: If3cd7c307da48193a288a7c70806d0038683b966