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

Change-Id: I591149f8569ae1812d6bdeee5717ed7dac5630da