am bdb23c26: am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb

* commit 'bdb23c26759089e29eb2f379e296bd006bc32b97':
  Fix issues 3425035 and 3423785.