Merge "Merge "Merge "Add null check for NPE before logging" into rvc-dev am: 5fe7d558be am: bcf30c6318" into rvc-d1-dev-plus-aosp am: 8a00e334b7" into rvc-qpr-dev-plus-aosp