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

Change-Id: Id3842e13f262c549deaa25101c38f60fb7e03614