Updated from global requirements

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