Merge "Fix Possible Deadlock with getFeatureState" am: 6bebb8418c am: 057f582e09
am: 9296dcff69

Change-Id: I22b387d5437ec62d8ba0d6ca869e86772fc44efb