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