Merge "Delete unused variable res_state.rstatic"
am: 852c08e595

Change-Id: Iab83baa30b3984ccec797cdc131ad29dac89bb4d