Merge b17e9211394640b53fa820baf31ca79e6ac1b616 on remote branch

Change-Id: Ie8cf1d06ec7b84affca469c0a8690fd7c8e172d0