Merge changes from topic 'am-736a6572a9704bdf94c4c8f32eb82316' into nougat-cts-dev

* changes:
  Merge changes I5bfdcf90,I32b0ed5c into marshmallow-cts-dev am: 53e358786c
  DO NOT MERGE: CTS Test for security vulnerability fix: potential OOB write in audioserver am: e2f015fb2b  -s ours