Merge from internal master. (cherry-picked from 1ce66541) Change-Id: I376b831df42248baadde7202a30a68112f752ff7