To TeapotNativeActivity and MoreTeapotsNativeActivity, respectively Change-Id: Iddbb326ef246232e64a9c30138edb55efe86230d