Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d
am: 860ef8810d

Change-Id: I60bdcdd36defa739e346481aa3f3a46ac90ccf32