Fixup for bug in last featured.py rewrite

Change-Id: I6cf630b6338c76999b02e788e70faffcab9ee262
Merge "Fixup for bug in last featured.py rewrite"