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

* commit '68457b9cd49a695ed50c51eb9c0d0b63fcead737':
  Maintain shared user list on OTA