Updated from global requirements

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