Merge \"Fix braino in the test to make it work on target.\"
am: b94b5706f0

Change-Id: I8877ecceb98659247afa67e1126aa029aee5f106