Merge 59145161212ff5c9b71b9830fe1201f56a36cb4a on remote branch

Change-Id: I7d6cede4d67bd7413e1a48d13a11089b2ed43d59