Merge 9a085604ae9a304f2cb4056492caa47467385e11 on remote branch

Change-Id: I132042df4058ee18cccc70213abe4fdb5eac49cc