Updated from global requirements

Change-Id: Iffc47de7b99ec9c6d587cbb3e79b29961c4e71c1