Merge da22ce1f3275639fd5752c01cf84c2eaeffd0d17 on remote branch

Change-Id: I08ec13f6314902b27b41a47088ef42d89603b795