Fix for assigning proper values

Change-Id: I353a9d4f9189a3c518961b17bf7ac29fa44958c2
13 files changed