am a21882dc: am c665e363: am 0d2adfbb: Potential fix for a couple bugs

* commit 'a21882dcfa0786a3f54ceaa4f5d8808173c477cf':