Merge updates from latest CM nightly flashable zip