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

Change-Id: I4f9297a151a2394a18cda5091636dd08a1dd51cf