This is a bit hackish and could benefit from further cleanup. Change-Id: Ibb8eddf88bffdea41fd94fea09ad6499d05ae715
Change-Id: Ic3bcc1297cde1c0680637d02c0e60528d2e60e52