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