Updated from global requirements

Change-Id: I9476a3a6b80bb35b2f507d27f77b7e77fabf14a0