Squash upstream from CM

Change-Id: If1aae06ad13eb146d1a40e949ab582425ea8791f