Merge "Fix Possible Deadlock with getFeatureState"
am: 6bebb8418c

Change-Id: I675c116e54d961971d4a32f87dd247cca51b5069