Merge 340cb475b72b0e870dac88548222f5fe18054a2c on remote branch

Change-Id: I8416b2fdbe74435d62129de5af714b9ca98a9329