Merge "cause sdk build hang. Revert "Add SDK 23 from build MRA44C build id 2166767."" into mnc-dev