Merge 83785536e94804938c82ba63d94c0afcc6fb9da9 on remote branch

Change-Id: Ibac2b3e1a77e9c7946eb9b996c54b726ef7f9441