Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-dev