From now on I will simply use addshore everywhere to keep things uniform... Change-Id: Iaf441b2d7a67a12c20529f0e9c7b47819f4abfae
This is split from: I03516bb34144d95e5f25c46ae98ab70ce699b31b Change-Id: I27539d25ef3e81cf991657dffc0a62b9719d21d8