Merge changes from topic "servicestatetable" am: a6e9ab760b am: 7637c5efcd am: 299e3a0946

Change-Id: I357eaef4c9811bc81bf7ac4a12fbd4a486c51c1b