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

Change-Id: I529c4c44239bc073044c2d49f0b6c474dfa20ab4