Merge "Enabled annotations for Metalava based api-stubs."