Merge c7439e65a7077ac6d59879a9b38f515a65b1240e on remote branch

Change-Id: I86de838b42083ae8a4ff12cdb7d5b8221e31c349