Merge 934eae9653dcddd84b6b28cb78fae6f3c944ffb4 on remote branch

Change-Id: I84480c07caf59a8aced5f932ef19daee197aac67