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

Change-Id: Id29f031ee02cbf5596f16c4fe7b3f3173d83e2a8