Updated from global requirements

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