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

Change-Id: I543404ccf3d7dfa472981597ff8b4bed6c4454f9