Updated from global requirements

Change-Id: If85a349cf76f0ea4d0d8bc5a9ea8ef48a32f7cc7