Merge RP1A.200720.012
Change-Id: I22e879f851ea891f691982336c0d81317a51fa20