Merge "Fix for http://b/issue?id=5064532"