Updated from global requirements

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