Merge "tests: IBaz, nasty nesting struct" am: b035e3a246 am: 4f6a409428
am: f570a83a1a

Change-Id: I950d564d95f4a72ecee3f04daa061dadf735dd23