Updated from global requirements

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