[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a am: 9b90490d1d am: 17ef28c5e2
am: 419f038258  -s ours

Change-Id: Iadeea4d192012c6c683d704c310b0e573543757d