Merge "Fix potential NPE" into rvc-dev am: 4c94835d am: c0b94305 am: 93132948 am: 489fb495 am: e250e611 Change-Id: I98c144aef53199104ab052e30c2a9a725f83bd5b