Merge commit '77bac6bd37a9a63f2aff5a8c6be25185884fde46' into HEAD

Merge commit from dev_repo to component dev branch.

Change-Id: I6f45e7c849458965078bcd15d4c00d9bd000e8ac