Preventing recursive referrence in drawables am: 99b25d2817
am: ced997ec10

Change-Id: Iab88125b030bfe21aad82a1b287495cb9e3f54a2