Merge "Basic settings for SpeakEasy" am: f003be12e0
am: 556325e028

Change-Id: I34a30754880ec00605941fa7bbf4eb910e677017