Merge c3517da6ba151b9ed3543d997683d74e869cf94b on remote branch

Change-Id: Iae870bae4792846f93fdd98fa1b66d06219585b7