Merge "Merge "Add null check for NPE before logging" into rvc-dev am: 5fe7d558 am: bcf30c63" into rvc-d1-dev-plus-aosp