am 9a091602: Merge "Improve IsMovableObject logic."

* commit '9a0916027e02a2fad2a37bc6bd6ce4fe9e560034':
  Improve IsMovableObject logic.