Merge "Fix unexpected circular dependency check" am: 399492a861
am: e7f1b4d661

Change-Id: I682f51f014a911f21c4bd282caf5d65c546a120d