Merge "Removing block device by-num symlinks" am: 6aaa3beb39 am: 3a6bf528be
am: 14c1dea777

Change-Id: Iae621d0ee6a3e329386549f977385b4f927b4ceb