Merge \"Make fastboot flash \'B\' partitions automatically.\" into nyc-mr1-dev
am: a3ffde1402

Change-Id: I634486ddffcf7d734cf20341c364addd465304c7