Updated from global requirements

Change-Id: Ifbdf60172f106b6b5e413167b48c0f8054d90df4