Merge \\"Workaround FAB background not being drawn on API 19 DO NOT MERGE ANYWHERE\\" into nyc-dev am: 3e5e792ce6  -s ours
am: 2b345a5593  -s ours

Change-Id: Ibe5d0a6debe769556b8368f17d109008c5bf93b8