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

Change-Id: I7b9af86a7441128f4e55aceca1b3b411a35bfcfe