Updated from global requirements

Change-Id: I01c685e1d51c8b0cee4deaa5b13d10943af24a9a