Updated from global requirements

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