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

Change-Id: Id17cfcfcb0a1a60e0a21ebc472cd7f47e4bc2ad1