[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 skip reason: Change-Id Ie4975eeda329f7b86236b849b26c1c589e300536 with SHA-1 d476a95d is in history
Change-Id: I76da2ff4b8ccf314f406a2e18796baeaaae124ae