Sync with google version. -01/16/2018

Authored by Yan Zhang <ynzhang@google.com> on Jan 18 2018, 5:21 PM.