Merge "Reorder getFeatureState parameters to convention"
am: e11ab258b9

Change-Id: I9b0671d59bb7503d0947d354a5e5030b20010cdb