Updated from global requirements

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