usmodify and test

Change-Id: I4b1c0a719da804d4d762b7d59ced7671baf8011c
Merge remote-tracking branch 'origin/master'