Merge bd34ada69fe1e03f8c6b446ff1d179f99c11bc03 on remote branch

Change-Id: I39d6aff1da0aaa75e4190326a1e1482320478053