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

Change-Id: I3818119b67726ba0cd2994e2153f9d99e455de0d