* commit '5520ec6f8958d9030a4c9b606b25be6190c75a08': cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
* commit '5520ec6f8958d9030a4c9b606b25be6190c75a08': cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb