Merge "Fixed resolver list crash" into rvc-dev am: 54ee569768

Change-Id: I101702c28c21c27b95e2f19a5140c0a1055dc0bb