Merge RP1A.200720.012
Change-Id: Ic48bbdc3e009f112957ebee26a0b6596a15cf286