[fixed] more @dirty annotations

Change-Id: I1c860fc465bbb344ab101a1df1e564b6f608c4a6
Merge "[fixed] more @dirty annotations" into unstable