tree 1de8906e5d02563b5d68e2bab05da7a9f0150985
parent ab71b1b74c3a49deb6fbc6adfcbe6188ded195db
parent 0bc4520c37e04f69e757158332b290ae79904aad
author Etan Cohen <etancohen@google.com> 1558643658 -0700
committer android-build-merger <android-build-merger@google.com> 1558643658 -0700

Merge "[CM] Fix NPE due to unvalidated callback value" am: 31717ff7f5 am: 51ddc176ab am: 60af769e49
am: 0bc4520c37

Change-Id: I51f708a4fc482d0fbe829da2b582ca4d00df6bf6