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

Change-Id: I744b3504199a7a6a11b52599368574c575526f21