Updated from global requirements

Change-Id: I4a932bbccd2a922dc593839ea9793700879faccd
Merge "Updated from global requirements"