Merge "Add support for L1 betty" am: 13f6ae06d9

Change-Id: Ieea8d67b0c22fdf6de888d5a24fb0451a4e3a9a9