Merge RP1A.200720.012
Change-Id: I6c72ead934c9a735e76cd1a979a38de4e8fac2ff