Updated from global requirements

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