Updated from global requirements

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