[automerger skipped] Merge "Addition of util library" am: 01e54d44b9 am: 0bcbe8861a am: d5d2daad18 -s ours
am skip reason: Change-Id I20e48e66d6c429a67d367efc2a73991c3aad825c with SHA-1 badc021aee is in history

Change-Id: I09b90da5140650830e3c871e1b02c08786a2bd3c