Merge "Fix test after inlining optimization."
am: 23d953942f

Change-Id: Ibc6265f156bf30355f6f29f1540ebe2fedd767ed