Updated from global requirements

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