Merge "Basic settings for SpeakEasy"
am: f003be12e0

Change-Id: I8581ac0edd3d457a1ed8cc792667e3c51ec15cce