Updated from global requirements

Change-Id: I5633c75ada16824a5ff4e73d9b34937714de0605