Updated from global requirements

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