Updated from global requirements

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