Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
am: 8ac5a94c01

Change-Id: I4ada7c21457a3222274998269d565a9bf03fdc46