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