Cherrypick  ea8c3e 5b7f0 7ff937 18da8b, cpick03, all pass.