tenderloin: update for lollipop

Change-Id: I575e35c6665ea5df33441d2b3e867cfb298a6206