Clean-up after last merge with CM

Change-Id: I358760900a9515f6fdbaf8d0173357e604fe8380