prep for planned s4 master swap

Change-Id: If01a93db57fd1e283b701e581b455fce56136dfb