Updated from global requirements

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