Sync with google3.
am: 044fd1a035

Change-Id: I0351dc6aab25615dca355d69dfd5bcac2ac72388