Merge "Revert "Stop & Resume property service when switching to bootstrap...
Merge "Revert "Stop & Resume property service when switching to bootstrap namespace"" into rvc-dev am: 293786f9 am: d17bf83a
Change-Id: I20ec9724a04ae36e482b07457b81b776431066ca