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