Merge RP1A.200720.012
Change-Id: Ie61f05b3eb4e038408720551081f781e8d1fbccf