Merge "Fix for http://b/111837117"