Merge 569498ab9a102b72a83ef19245ed62e11828ab7f on remote branch

Change-Id: I611b56ae6ef7d5921bdaa092dcdf09a7609bb08d