Merge "Fix nullptr dereference." am: 8e1ac14f40
am: 209841d764

Change-Id: Ifef7ecdcda2d52abe15113fcfdc148e3208e9d9d