Merge "Fix NPE" am: 78658058dc
am: f66dc6a966

Change-Id: If19ae7caa499cadea126ae8d29f83361a71708e1