Fixes LP Bug #1016656. Change-Id: I22455d27cb82830dabd4fb0677da26915a60eb85
Change-Id: Id68231ced070b27d1f7fb5a230d345694632e7dd