Fix status handling

Change-Id: I892c6378c2bd59434043934e1b10fe1d9e632342
Test: build and run on device
1 file changed