Merge "Protect against NPE" into rvc-dev am: 2d1efb2e6f am: 3382048743
Original change: undetermined Change-Id: I3da1ec8064052492d9b4289c0e9370c03dd200ad
This commit is contained in:
2d1efb2e6f am: 3382048743
Original change: undetermined Change-Id: I3da1ec8064052492d9b4289c0e9370c03dd200ad