Updated from global requirements

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