Merge "Exception in AAIRestClientImpl.java"