This made it into RC-1, I forgot to put closes-bug on the patch. Change-Id: I466463e1f921d1d07227b987b7d80274fcdd5f42
This made it into RC-1, I forgot to put closes-bug on the patch. d07227b987b7d80 274fcdd5f42
Change-Id: I466463e1f921d1