Updated from global requirements

Change-Id: I64dcc6f9552cf7f8b6ff3503923e9acc58e3f5bd