Merge "Fix null pointer exception"
am: 7ec6e722de

Change-Id: Ib707ca2884ac5a5fb3bd3704a314387163474bf1