Merge "Revert "Apex: update sha commit hashes for Fraser""