Merge "Use drawables for placeholder backgrounds" into pi-car-dev am: f5aa20dcb0

Change-Id: I1f2db27125b9fb16728b383dec5d3cb7fa048094