Track local Phone and Dalvik

Change-Id: Ibdb603f35a0f2c634afbefd17a7e7bfa5912890e