Merge "Fix a theoretical NPE" am: c312053b am: 668661d9 am: df0ee25d am: 550a0e9b am: 96114c00 Change-Id: I762e107606d5974b04376711c256fd8758546854