Let's make Amazon work with the form chooser

Change-Id: Id4b8b7fc1cd52f2eca04dbae4133bbd58413a942
Merge "Let's make Amazon work with the form chooser"