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

* commit '9d4584b907bcd05e48e54cde0de9c56b988c26da':
  Zero-initialize launch option fields

Change-Id: Ie127b0db0a45c1ac58e4d1949e6508ccd43af231