Corrected merge problems from last sync with CM sources

Change-Id: I978bace00f85824ec5fa8f8d714317cf2696437b