Break circular dependency chain introduced by: 0a20da45ed Change-Id: I64c7714ec46d4fcb08a4a532c8169d497d533e77
0a20da45ed