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

Change-Id: If823f0d0431473d0bf0a3890abeb394ab903ea02