Merge "Resolve Android security comments for Android ID migration."