Merge "Avoid infinite loop with mutator lock."
am: 9d2f7f87c7

Change-Id: Ibbf9c5132e65283206eb3328f917dcc536910cfb