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

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

Change-Id: I4e0b0202a4527d0eb1f5d8203b52ecd167857eea