Updated from global requirements

Change-Id: Idf9d0d18712ae9216219848943c3a2330d78362b