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

Change-Id: Ia3e1e58acda7aa3099c93f1f6c2bef9f53828e4d