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

Change-Id: Ia42090c8959bd81a0a86d290f64062521543a1db