Replaces << (deprecated in 4.x and removed in 5.0) with doLast. am: e81a22cf78
am: ea696d07d8

Change-Id: I388278d95b69b0fe7dda9f8d5a06ece8f0c6915f