Updated from global requirements

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