Updated from global requirements

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