Merge "Fixed service state CTS test failing"
am: ab5bc3be50

Change-Id: I38fc94d366a16acee810fd9336750044508cf766