Updated from global requirements

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