Selected reconciliation with garwynn/cm-11.0

Change-Id: Ia55dcf2c81410b3221158a0423d0c349b252ba99