Merge 3b173a062718fa1476db33918d6bb31bf5b4b69a on remote branch

Change-Id: Ia59f45f73866da6e8449a5cd7ee87bb9843bb647