Merge df698b86b3164bdcee8a4412e56f57c716a71a81 on remote branch

Change-Id: I312163df0e451711d5885172c6faffe0c40a209c