Squash merge CM Oct 27, 2013 11:02PM

Change-Id: I5f0fca4b4306b93250d061a51706fe27ce206033