backport block drivers from 3.0

Change-Id: Ic157706ae84e5d1fbe38e1000e0fafc3425789b0