Merge CyanogenMod/cm-12.0 into cm-12.0

Change-Id: Ie6203ceb6209525d9b3444f83d3e6cebf5df29c2