Updated from global requirements

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