Merge \"bvb: Update path to key since repo was moved.\"
am: 8b3b1727da

Change-Id: I0256523824d49aa59ba61eec18b85a9a2a9324d2