pull in changes from CM11

Change-Id: Iacae99486ff11fbbea65ec90c3b4fd103258bb53