Changed after review

Change-Id: I8291b8b91c24579446be328760f26a3c4d750f84