Merge "Adds instant app visibility to instumentation" into pi-dev
am: c0f025b253

Change-Id: I8a161d6eee0c8d4404edf19191f5b3b0d9fc2eec