Merge e659cd1afaf0f9deff4c3dead068bd030f8317da on remote branch

Change-Id: I4a4dce13d960356c57568d2433abc254a007113f