Merge "Fix lunch choices w/zsh" am: b836b175c5 am: e8d3948ec5
am: 1ed3fc2f88

Change-Id: I2f16ead0ef4288959d15cee7e165106914329fce