test branch for xt926

Change-Id: I9adb3edf44dadc128432c0daf3020b0ca3b51685