Merge "Expand Duo Interface"
am: 51a10f66f3

Change-Id: I6c2312ab0e2063c552fdaf7b8703c74e945e420b