Merge bd7daefdfc5c21bd3a74aaf336bbe723af7f0ede on remote branch

Change-Id: Ic935b56651c6a541b41f91a2ca758b75f355e1da