Updated from global requirements

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