Merge changes from topic "cut_dependency" am: 661bb0414e
am: 3e40cac16a

Change-Id: I82a66665741eae62a9edbd956464c7ee070f4950