Updated from global requirements

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