Merge \"Clear calling identity before calling mountService\" into nyc-dev
am: b2a45c00f6

Change-Id: Id3e9ac55d5b8e28cf9c3bdc7da4956988e69eeec