Updated from global requirements

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