Sync from global req

Change-Id: I1f5b388f9fd13175381078c1e780416e826f3543