Updated from global requirements

Change-Id: I67c2cc189e1acd5b9acdcc6d111ee73f7b631feb