Sync with google3 version. am: d3bc59a622
am: 408bdefc5c

Change-Id: I0cdc4f1db0a136bf5a78a1bb8583458beed6f710