Merge d194aab57afb42f802c5edef7782a845795a2495 on remote branch

Change-Id: I1da9433da187de07ec6ccc75571a1284ad487763