Merge 2fedd5681ad2776006de5deb4a4c549b91729382 on remote branch

Change-Id: Ia33a805ca50bdbbbe8e29c52b247c146dc10ed18