Swap and for &&

Change-Id: I7821a62586cc2d2f929fb3d7d5046958a70efbd0
Merge "Swap and for &&"