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