Modifications due to adding AllJoyn Support in apps