Merge "Make 674-hiddenapi more deterministic"
am: 0e920facfc

Change-Id: I6d7d657eb50a76af85f658813196133222de3eef