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

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