Merge "Cut the dependency" am: 4c963eac67 am: 773c0a08f7
am: b1ecd7efb0

Change-Id: I55a5bee016e015321590fef6956d147924d13c81