Merge RP1A.200720.012
Change-Id: I01d555e50b6b335f3588bf6985304fe8164001ac