Track Superuser branch jb-mr2

Change-Id: I917bf2064aaf7c35422290bf4860e9bc648eda28