Updated from global requirements

Change-Id: I558d64ab43c42f7d71f5783c1d63db5be53c8bf0