am bf2589fb: am a728543a: Merge "Fix a couple small bugs (issue 6539339)" into jb-dev

* commit 'bf2589fb51613f185b65140c40c4c52541af7b29':
  Fix a couple small bugs (issue 6539339)