Updated from global requirements

Change-Id: Ic974528437dc90a548c58749192ce592af51ecde