Updated from global requirements

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