Merge "Remove ijar" am: 1dcffadbc7 am: dee143988e
am: a3e8ffd536

Change-Id: I80497bc760a2e6571b4a837b02f5db9f42f932b7