Making casting sensitive to connectivity issues

Change-Id: I0d4ad778380ea94bb0eadb9ecdd4b10cfc9ef490
12 files changed