Merge "Uninitialized member fix :(" into rvc-dev am: b9bc1dff am: ae88283a am: beb71cfa am: a61a0046 Change-Id: Ie198069c4498f02213072afb1a3ca236bc77dcc3