DO NOT MERGE ANYWHERE. Update support library @ 2714982 from mnc-ub-dev.
am: 542a575  -s ours

* commit '542a575050c960efc587a7a45d5a1f09fba93fc1':
  DO NOT MERGE ANYWHERE. Update support library @ 2714982 from mnc-ub-dev.