Merge 2cc132a765140dd64412d9f6578a449322e0dfc5 on remote branch

Change-Id: I644654fca5ff49cf8cf35e908302df4afdaedd52