Updated from global requirements

Change-Id: Iadaba02241b4f5fe36537288a321f2101d14c30c