Merge 8dbca1ae84793b8a39adec1fe652963b69ea52a1 on remote branch

Change-Id: I857e2eeb853747d84c85156d057c3bcb5dcebb84