Merge "Fix null pointer exception" am: 7ec6e722de
am: aa16fd8e2a

Change-Id: Icd27c5a29f32f2f1490abc36c70948df2344f950