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

Change-Id: I03cd46bfc793850c07332a1d30842d206946e9e2