am 10d158c2: am 931c12b8: Merge "Fix dbus build." * commit '10d158c2bada25c85a1797b83af67ada7b1c0452': Fix dbus build.