Merge "HRem support in BCE." am: 0cb2cff166
am: 773c37627d

Change-Id: Ibf10dfc72871724c07c3281b9e9d1f556f96985e