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

Change-Id: Ie1a7e7e868d34131baedb5d6ec127a7052d0fa76