Sync with internal changes.

Change-Id: I4db1e38597dcd76acefe89e2eb28cc5bae16178e
3 files changed