[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a am: 9b90490d1d
am: 17ef28c5e2

Change-Id: I7e2e495eb815655db3ea365e44d069dfb6227a5a