Updated from global requirements

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