Merge RP1A.200720.012
Change-Id: I55af6e57f4fe65b595c7df70e3f6300a37bb7f62