[automerger skipped] Move test cases to unit test am: 39f7b16d -s ours am:...
[automerger skipped] Move test cases to unit test am: 39f7b16d -s ours am: 781e0d25 -s ours am: e997ce91 -s ours am: e346c018 -s ours
am skip reason: Change-Id Ie4975eeda329f7b86236b849b26c1c589e300536 with SHA-1 d476a95d is in history
Change-Id: Iafd73a592cb84e26e02c4dc6fd4d474540622143