Unfork some ANS setup code

Change-Id: I85e1b3cc4174029b6d1bfa4109b37793537071c2
2 files changed