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

Change-Id: I5a156356ff2914a1a9143284e8f0135d22c69898