Merge "Better error message when finishing non running appop" into rvc-dev am: bfacf243 am: 6fcc6181 Change-Id: I48706e38c89c39ee063079d92994b596e2ccc689