Selected reconciliation with garwynn/cm-11.0

Change-Id: Ia55dcf2c81410b3221158a0423d0c349b252ba99
Don't be hating on kltevzw

Change-Id: Ic5c62cc680ad877fe3c0cf954f5dbe3e005c1fad