Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp

* changes:
  Merge changes from topic "mtp-user" into oc-mr1-dev am: 4de4655f0d
  Reset functions to null when user changes. am: e537a83139