Updated from global requirements

Change-Id: Id642f0727039484154628bbb7f9ec5f5eda2f633