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

Change-Id: I674fa62c01471433e7316c2aa28d16b81eaafa43