Merge changes from topic "cut_dependency"
am: 661bb0414e

Change-Id: Id8b72d00604e9b1761068d89b3bfd05e48d9a0a1