Merge "Cut the dependency"
am: 4c963eac67

Change-Id: I338506ced43b8427dfa9f1d59122b2a7daf1ef83