Updated from global requirements

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