Merge changes from topic "cut_dependency" am: 1e29946a3e am: 11d1312db4
am: 617aaded62

Change-Id: I3237685f73eb66ddb1c6ffa2f5d8a71a0e0c6e09