Merge "Fix NPE"
am: 78658058dc

Change-Id: Iab42549310f6fdc6154c57a77721073a414215a2