Updated from global requirements

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