Merge a61eb479ea6c8093d44e1f322a19b7826ed3a4bd on remote branch

Change-Id: I06c721e3b198882cc8f67a3a835ef700be61ce4e