Merge 2cc132a765140dd64412d9f6578a449322e0dfc5 on remote branch

Change-Id: Ie565d247cf53485a95fef0645a5070bd35baafaf