vts_ibase_test: general-tests am: 3b757913bc am: ce3ca6462b

Change-Id: Ibad3f0f18579eda97bee6c23dae2235b78fff69a