Merge "support expanding advanced settings from intent extra" am: 838bc45caf
am: 5a67699e7e  -s ours

Change-Id: I5fbd4ba8519be515cbdddb6f2c99c75965a3906d