Updated from global requirements

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