Updated from global requirements

Change-Id: I7431b746fc0ac8992d9cec94b61b66654bfb8081