Merge "servicemanager: remove move check TODO am: cd551fab41 am: dd5952a48f am: 48c24c25a0 am: 19f6bdc145"