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

Change-Id: I26b3ba7ec192b848a1d9a47363348cfcac5337ac