Merge "Fix null deref crash" into nyc-mr1-dev am: fc9689e1ed
am: fb20b5e13b
Change-Id: I4b6b45446a8c25cda3505c4775000253b115e96a
This commit is contained in:
fc9689e1ed
am: fb20b5e13b
Change-Id: I4b6b45446a8c25cda3505c4775000253b115e96a