* stable-2.13: Fix NPE when requesting invalid Change-Id to index Change-Id: Id909cd3585a5631bb0ae7947e6e4cb94117fc3a9