Merge "Addition of util library" am: 01e54d44b9 am: 0bcbe8861a

Change-Id: I8a5d86349faaf3a365c9deec265a073efbd47562