Merge "Va_end should be used with va_start"
am: 5f4808382e

Change-Id: Ie79756bdc9a34b4d5b90057a74a0f6bd0007b655