[automerger skipped] Merge "Reorder getFeatureState parameters to convention" am: e11ab258b9 am: f6b214da1c
am: d26ea8807f -s ours
am skip reason: change_id Ifd2739cd8e26c34e3e771a43661e0763929e7a6c with SHA1 ac9b16e28e is in history

Change-Id: Ife5bdee817bd0446c026b3e37d243b2a0a64f4b0