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

Change-Id: I4c9552e5d70f90bbe9fc6712f1a72c5e4499b731