Updated from global requirements

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