am 4b812738: am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread

Merge commit '4b812738c70be53e79ba8a6b9c93de14388d1311'

* commit '4b812738c70be53e79ba8a6b9c93de14388d1311':
  Fix getTempContainerId()