Merge "Uninitialized member fix :(" into rvc-dev am: b9bc1dffbb

Change-Id: I313c06155c2052f3a6fad4b649c41923016219fa