Merge "Remove internal listener when cloning" into oc-dev am: a7dde34a81
am: c59f75af1d

Change-Id: Ia44c46f0784c412d71956c9e7f1e17533c991b9c