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

Change-Id: I564533914e0267411a0aa363735222845cc0e38f