Commit resource changes from r17160.