Merge "Add debug for bug 21055376." into mnc-dev