Updated from global requirements

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