Merge c125a6f3504bd35ab796754206085f369f415bf4 on remote branch

Change-Id: I6568424cd2e1d1e44139918c10f0b2db5e0eddd9