Updated from global requirements

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