Merge RP1A.200720.012
Change-Id: I5d932d65266d543837229e6e0ae64e0dd8dccf9b