Fix warnings introduced by insitu branch.

Change-Id: I81bb9eafdf0a0a63f8ac2728720f5959d93ec440
Merge topic 'warnings' into master

b4612f5c Fix warnings introduced by insitu branch.