Updated from global requirements

Change-Id: I7fd4a2770a2b9b3b6dc7d3e61a4500013d8c3195