Updated from global requirements

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