Merge "Update exception type thrown when NetworkStack is missing"
am: fb60c85219

Change-Id: Icbf7db83d73a1912573e71c71f694f2d37d788af