Updated from global requirements

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