Updated from global requirements

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