Converting some tests to TAPL am: d11b604e19
am: 687d8a1c03

Change-Id: Ic984308cdbd75022659afaf704955297df9bee1f