Merge "Suppress PhanUndeclaredProperty for custom properties and phan bugs"