Updated from global requirements

Change-Id: Icb4cc9e79d5974c1824fe9b43f56134b704b6b2e