Merge "Hold wakelock while dexopting" into mnc-dev