Merging branches manually so as not to break anything.

Signed-off-by: Tushar Narayan, Ned Shelton, Xia Li, Lauren Kahn, Michael Perrone