Merge 89dce266efebcbb548d17157086d2659dd1a7df6 on remote branch

Change-Id: I16ca609404ae3223c31c381bc2385a6c7c00f725