Updated from global requirements

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