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

Change-Id: Ib66d52e5dd68988ff7104b64b67a14646d345ce8