Updated from global requirements

Change-Id: Ie55fe9dcebb96340f401bdb632da7ad1a37208af