am 7aafcce2: am f9af1941: Merge "Inline methods with multiple blocks."

* commit '7aafcce2334c59620ebbf487bf8fd4c4aa99722a':
  Inline methods with multiple blocks.