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

Change-Id: If1e2cbc861ff8b55e714c36e053ab5bb90e19126