Merge changes from topic "cut_dependency"
am: 1e29946a3e

Change-Id: Id38b33ef756ba41f51c161ef247952c387512b2c