Add context to parameters passed to ExtraSettings

Bug: 13791528
Change-Id: Ibcc4db1ab07b274f18f1ab369747d759180f155b
2 files changed