Update to application settings

Change-Id: I1db81d0ac7afbfbac1150f0765ac86f70cbac087