Updated from global requirements

Change-Id: I802b75cd315cd45835efc334a9bce2695a08cdc9