Add cleaned up unit tests moved from platform
am: 35ef4b5382

Change-Id: Ie76a1a220cc31179ede43b7e2629f764de626260