Merge bf4a6a0a8509efdf9e6e8b3e33e4c8594261422a on remote branch

Change-Id: I5e667da3361c03275729610e1dd3c32730907fd3