Merge "add API to get hash descriptor" am: cc20ae7733

Change-Id: I20698a52515c5298b88a23cdd932f252a8341c6d