DO NOT MERGE ANYWHERE. Update support library @ 2525958 from mnc-ub-dev. am: dcdcd250c0  -s ours
am: 50a9f2f9e4  -s ours

* commit '50a9f2f9e40ee0fb90aed10624763c6cd1955c84':
  DO NOT MERGE ANYWHERE. Update support library @ 2525958 from mnc-ub-dev.