Merge "Fix typo. bug: b/20610710" into mnc-dev