Plain Diff
am: 0aa7ec19 -s ours * commit '0aa7ec19': DO NOT MERGE CipherTest: test instance reuse with updateAAD Change-Id: Ice3c406dbd72145d6ba2fdac313bfb3164dfb3cd