DO NOT MERGE ANYWHERE. Update support library @ 2838360 from mnc-ub-dev.
am: d57f5b0694  -s ours

* commit 'd57f5b069430d8a25d823050d07939b332c34ecf':
  DO NOT MERGE ANYWHERE. Update support library @ 2838360 from mnc-ub-dev.

Change-Id: Ic64b94b95c28a8b9fa3a24f4537097e3ef766d29