Merge d26c346870d69e6e3b25a471fd0e40e6d49680ec on remote branch

Change-Id: I83720fbbce4bba041c524057171b3979ed785b91