Updated from global requirements

Change-Id: I68341cf5814c4d312535efe679143a14a3391215
Merge "Updated from global requirements"