Updated from global requirements

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