Fix the code which caused the NullPointerException. The commit which broke this: https://gerrit-review.googlesource.com/#/c/93482/ Change-Id: Iedda3900396cd33f7dc40acac47968f493d13e3c
Fix the code which caused the NullPointerException. The commit which broke this: https://gerrit-review.googlesource.com/#/c/93482/ Change-Id: Iedda3900396cd33f7dc40acac47968f493d13e3c