Updated from global requirements

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