Fix secondary output under&over run
am: c4e90131d8

Change-Id: Iae6075f2cbf05dfc6dcb8026409783afdf5622e7