Merge c393d904e6cf05baf609ca02c842d5e90efb5b45 on remote branch

Change-Id: I3354afe80d8fa7223cda21f62db8fe65e6935f8a