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

Change-Id: If3427de3d3d1d5c1561d93cf9e136bd6ba48d651