Port of 502be24afa122eef08186001e54c1e1180114ccf

This patch ports the above mentioned commit to glance.store

Change-Id: Ib5259a64aff4157da5d32dd092a17314cd3ea311