Updated from global requirements

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