Merge changes from topic "interface_builtins"
am: 4880d44d2a

Change-Id: I1968c2bbc2292e0d467246acc5aa17ca0c165b5f