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

Change-Id: Ida33a3d8028bfec187160ba66eeb164cd78619e3