Merge "Fix CM test http://b/issue?id=6125619"