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

Change-Id: I29b7207d83fd2fe6f6ca1d5e12e6f9e12d70c9eb