Merge "Pass url to the AIA supervisor" into nyc-mr1-dev
am: bce1e8c836

Change-Id: I1e86b7d1b2d79417a704e62efd11969888c5ee88