Merge "DO NOT MERGE Fix mTrustManager NPE" into mnc-dev