Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev