Merge "Fix NPE" am: 78658058dc am: f66dc6a966 am: 085bce44f9 am: aef181528b
am: 048b643bd8

Change-Id: I63d44cbd21ee8635f40d3cc4d965c6e3dea0ad4d