Updated from global requirements

Change-Id: I9ab6296a6b955b6dc01cc01a94619cf784664afc