Merge "Fix secondary output under&over run" am: bb3c777e40
am: 6252c394be

Change-Id: I2c4aa423fe54a0f072f1a995c53b1538104ba4b6