Merge a09378faa73ed0e991f8ac0a146e4947e54af392 on remote branch

Change-Id: I1ac61acb2b687286265cbe3452f6166d1cc5b3ef