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

Change-Id: Ib48b82ef05adb574d64a8c749a5ddcce1eabe047