Updated from global requirements

Change-Id: I7bcaf9b4cf342d66d78011c197d038abf1404fec