am bf17772c: am ad05677b: Brian\'s vendor/ change requires a clean build.

Merge commit 'bf17772cae2a11cf4039e8652aee3b96af7a739f'

* commit 'bf17772cae2a11cf4039e8652aee3b96af7a739f':
  Brian's vendor/ change requires a clean build.