Merge "Showcase: Update SDK to 23 and support lib to 23.0.1" into mnc-ub-dev