Returning skip decorator in deprecated function

Change-Id: I5fe69eb9bf4b032bf5e67b5e2a05140cdd779bd6
Merge "Returning skip decorator in deprecated function"