Updated from global requirements

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