am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev

* commit '170bde83ae90e03b7964edf2a00da6f83c406910':
  libutils: fix overflow in SharedBuffer [DO NOT MERGE]