Updated from global requirements

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