Continuing experiments with test stability attribute am: 7ad1026cad
am: 7ab1d09f84

Change-Id: Ic98bb7366224c567ed20ae7ee5bf2be5c152d342