Updated from global requirements

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