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
am: 8025232f7a  -s ours

Change-Id: Ia35d8f387f248d1e6b7240480314b404396ce19b