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

Change-Id: I0901b093dacaee5ada430d993792d5ea1ffee042