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