Updated from global requirements

Change-Id: Id05745fbc6623394ef4d1e4fd9e9549fd1ffc3cb