Merge "Check result of registerAsService in dumpstate." into oc-dev
am: 5221194a30

Change-Id: I83beb7c1a92135a441b4453931d70d4f5c9deec5