Merge "Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112 am: e3bcc4a895" into sc-v2-dev-plus-aosp