Fix secondary output under&over run am: c4e90131d8
am: dff95d8303

Change-Id: Ic7debba8de9e77ecf34beca10d7096c404a1c63c