Cleanup enterprise feature in ContactUtil am: e2ccf8bff5
am: 9cd2bdf010

* commit '9cd2bdf010086e5b2bd1f4a4f5edaac77da1e101':
  Cleanup enterprise feature in ContactUtil

Change-Id: I8db4a01a1a9981682344ebebb8c87f4b4fb70aff