Updated from global requirements

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