Merge "MediaRouter: Remove unnecessary padding in MRCD" into mnc-ub-dev