Merge \\"Add a null check for mImpl.\\" into nyc-mr1-dev am: 5a4cfd36c2
am: 567be59cb4

Change-Id: Ib84725d14d7b0adbc0e26d67648a997f827a32cd