[added] more @dirty code

Change-Id: I6965f9e428df0e9baa8e0fb96faed5d7eac25d01
Merge "[added] more @dirty code" into unstable