Merge "Fix getTempContainerId()" into gingerbread