Merge "Support Library v23.2.0 API Diff BUG=26448279" into mnc-docs