Updated from global requirements

Change-Id: Ie6842e39eeb65597b070eb61d9def4ea24f0071d