Updated from global requirements

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