Updated from global requirements

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