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