Merge 89dce266efebcbb548d17157086d2659dd1a7df6 on remote branch

Change-Id: I246c5291b81ef1d61fd0a60448c057cc550b3b8e