Various Changes

Change-Id: I159825fd07d6a2832eaab3bf3076c6be12fdd037