Merge cherrypicked r279402 to fix checkbuild.

Change-Id: I903284c842b92ff0c41ba257d654f6c15037bb15
3 files changed