Merge 934eae9653dcddd84b6b28cb78fae6f3c944ffb4 on remote branch

Change-Id: I4a93cc2a9fa97ad0aded7798887f9c66153886d6