[automerger skipped] Add cleaned up unit tests moved from platform am: 35ef4b5382 am: 8acff00705
am: c0558dc2ce -s ours
am skip reason: change_id I9b88b2f84ddb4250a435aa9292224620c990bbaa with SHA1 c8e1239c6c is in history

Change-Id: Ice201af4a2e884330771f665669f1c88368d5903