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

Change-Id: I39abe7e2e8bb3ecf5c49761caa9b64bc020f70d7