Merge 49afe7c74ea5bb810d64553387269e48dd0f133c on remote branch

Change-Id: Ic9de6dd8dcad5c204363ba5c9381c9e250e02960