Updated from global requirements

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