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

Merge commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0' into gingerbread-plus-aosp

* commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0':
  Fix getTempContainerId()