Merge "Set jack.assert.policy value to \'always\'" into nyc-dev am: 1100edb83f
am: ce528bba46

* commit 'ce528bba46a735fefd2109c670fef578204f1fe2':

Change-Id: Iebb23c67d7cb76df4344e3d84001e496b1382db4