Merge "Merge "Fix NPE in LegacyGlobalActions" into rvc-dev am: e3041c9a16 am: 61a85b962b" into rvc-d1-dev-plus-aosp am: f29f5fbd0c
Change-Id: I7f3fcfce2287cc37ea91dc37d72304c2ba2d1af9
This commit is contained in: