Conflict resolution of AndroidComms branch into Android_APIs