Merge 0c6ec975493afe44d81399445bc929bd33d1969d on remote branch

Change-Id: I51ca5ac79931b642ab551dfecab46602c32a64b0