Updated from global requirements

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