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