Updated from global requirements

Change-Id: I02c65db0ea9ef2c86d4bf280d811e8cd28deadb9