Merge "Addition of util library"
am: 01e54d44b9

Change-Id: I36919f94fb5fecb0a6410007ebe8b2a07ee6f0bd