Updated from global requirements

Change-Id: I88286d9ef8ff5fc5210a9ed87bacffd60ff78a56