tree fd20dee229360c3172dcf4ae54b5d5aada81a370
parent 7eb965ca0c6523e7c4627ea256c8e37e0db1341c
author Jian Li <pyguni@gmail.com> 1536839974 +0900
committer Jian Li <pyguni@gmail.com> 1536974869 +0000

Fix: resolve a set of NPEs due to security group activation

Change-Id: Idfd93c80f710e85370f9054d93b9b7e96c77fd49
(cherry picked from commit bcc422822aec2a4cceb8ea35c3f7d4eb57196759)