change branch

Change-Id: Ic20d23c2f7ea738136469658ffaa77dfb1dc64a4
merge CyanogenMod

Change-Id: I6ecc185b7580d68f83f9d3f85f36ecfd4b6e540e