Updated from global requirements

Change-Id: Ib4e1a78dbd236c75571ebaa49c300d6d6cc8b27c