Rebase to CAF MSM-3.4