Fix NPEs after merge of d159ec534823b87f9896843e95912b0df8c27e16 from open
source master.

Change-Id: Ief98236102983698e4b753ec9649142761c86607
3 files changed