Settings added

Change-Id: Id67b8864c5fe0828222922d027b8e37d1c89985e