Updated from global requirements

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