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

Change-Id: Ie86a2c08f5d60be09170076fd82149acb01d23bf