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

Change-Id: Ib5a00e7e7e7a9b85fa5fa61f60355432a39b50db