[automerger skipped] Move test cases to unit test am: 39f7b16d am:...
[automerger skipped] Move test cases to unit test am: 39f7b16d am: b7522cf9 -s ours am: 211388b2 -s ours am: d9abec84 -s ours
am skip reason: Change-Id Ie4975eeda329f7b86236b849b26c1c589e300536 with SHA-1 d476a95d is in history
Change-Id: I9523281b0e7490da052e8389820429ce62b16f5d