Merge "Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab99b am: 9cb37b0f37 am: eff219ab6e am: 882e5d7f74 am: fd86694c4d am: 1451b1b4c6" into tm-d1-dev-plus-aosp