Merge "Adds check_interface_{restart,start,stop} check_builtins." am: 0d061b258a
am: f45125137c

Change-Id: I636cdd75d3dbbbdeeaedcebf1017b70872024670