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

Change-Id: I26403fba055ca356ed69b599525dc7b6cf795b61