Merge "Zero-initialize launch option fields" am: 9d4584b907
am: b3ea343725

* commit 'b3ea3437255b1c50b9be95de30f87b1b0ea15289':
  Zero-initialize launch option fields

Change-Id: I13d5d1820127ec5db81de73eba7e921efa662486