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

Change-Id: Ibb7d325a0c363b9cf62fdf8ef8fd333ca3f534ee