Merge 5105c3a2ef1bf8bac29c2028e41d245a3a326e13 on remote branch

Change-Id: Ia406b3ceaa2e800a53bc292ab2afacc92fd3aa3b