am: ca67844e0c * commit 'ca67844e0c6b564970b8d329009c0d110888a3fc': Remove deprecated methods / classes
ca67844e0c