Brown paper bag bug fix for If9e1c690831001f79e8119267fdaaad13ab244d5.

Change-Id: Iea9ae595a63638fac89463932557c19549b49d8b