Merge changes from topic "am-979a2aa2fa2b4fe1aa18dbf0ae3aaa16" into nougat-mr1-cts-dev

* changes:
  Merge changes from topic "am-3cdf2ccd35624e28b821e85b3120f82e" into nougat-cts-dev am: c92c0269ee
  [automerger skipped] DO NOT MERGE: sonivox: fix hang caused by bad meta-event (cts) am: 035f84a68a  -s ours am: 6a14ec962d  -s ours