Preventing recursive referrence in drawables
am: 99b25d2817

Change-Id: I1c23d40e590d6d8bb21f6734a106d0ee217b6672