Merge "Make 674-hiddenapi more deterministic"