Updates from hbase98 group

Pulling over changes from Narendra, Oliver, Shang-Sheng

Change-Id: I9bb7214553714068f9a90a8c65ef3db0a041eaa2