Merge "Reorder getFeatureState parameters to convention" am: e11ab258b9
am: f6b214da1c

Change-Id: If51f16a60257da8cf0321dd61b4b7610fa8a2513