Merge \"null check jarfile before using\" into nyc-mr1-dev
am: 15ba58b8a4

Change-Id: Id492d8ad826be2ceea651bcfa73aaa532f61e9a7