Merge "Update support lib to use correct current SDK DO NOT MERGE" into mnc-ub-dev