Updated from global requirements

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