Merge changes from topic "servicestatetable"
am: a6e9ab760b

Change-Id: I561031cb2fd1367915168b143b32f44fe3828493