Updated from global requirements

Change-Id: Icf3e0292d110a4f164f41161a9397cdc6d87b0de