Merge "Settings performance testing" am: 32ca9b270d

Change-Id: Id0f496b2c8709c2655eadccef900256d52a6a130