Merge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b"