Updated from global requirements

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