Merge changes from topic "drop_circular_dep" into stage-aosp-master am: 70fb81076e
am: ec493198bb

Change-Id: If5f97064a3a3a440b2badc18a0d7d4ac92265407