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