Merge "Fix null pointer exception" am: 7ec6e722de am: aa16fd8e2a
am: 825317ecbc

Change-Id: I3bef2d080dbc5130edba788686832cd55e2d6069