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

Change-Id: Ib38283374a94ed4e38c6eab3077a6586fab1a1d1