Updated from global requirements

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