Updated from global requirements

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