Merge dec27fa79fdc66736297c4603feeeb74c164f550 on remote branch

Change-Id: Idb8776de76823802a8b63773708a0a6b38e0c56b