Merge "Add a few type for Analog frontend" am: 69459316b8

Change-Id: Ia5cfbf4393123f7e8367b418ac58b01a3739bc22