Merge "Add a null check for mImpl." into nyc-mr1-dev