Updated from global requirements

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