Updated from global requirements

Change-Id: I41f2f679b40830427841f1c5c56b8d95ec49b786