Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev