DO NOT MERGE ANYWHERE. Update support library @ 2557236 from mnc-ub-dev.
am: 3e159167b7  -s ours

* commit '3e159167b7687b570d068875cb3e99c88db57daf':
  DO NOT MERGE ANYWHERE. Update support library @ 2557236 from mnc-ub-dev.