Updated from global requirements

Change-Id: I4f26d3a8790c799e5c1f7f81031406e0c57545f9

Change-Id: Ica7315effe308bd739e90f885849fac27a3c542b

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