Merge "Fix gtests after loop inlining support."
am: 7997bafd29

* commit '7997bafd29c483583bcaa3135d958403caef94e3':
  Fix gtests after loop inlining support.