Updated from global requirements

Change-Id: Ife30227ffa4b1107273d62a89526cf306d870092