Merge remote-tracking branch internal into fb_upstream
authorStewart Miles <smiles@google.com>
Thu, 19 Nov 2015 11:07:49 +0000 (03:07 -0800)
committerStewart Miles <smiles@google.com>
Thu, 19 Nov 2015 11:07:49 +0000 (03:07 -0800)

Trivial merge