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

Change-Id: I3cb9d6457c0348739e57802099c51b0308bbe05d