Updated from global requirements

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