Merge "Maintain shared user list on OTA" into mnc-dr-dev am: 0cd10ec8cf am: d12f298da4
am: c9f3b2f54b

* commit 'c9f3b2f54b042df97a806ad114f21cca26a8341a':
  Maintain shared user list on OTA