Merge "Fix build breakage." am: 29a7fd300a
am: 905d0d2543

Change-Id: I11c15a16cd6abb6fa2ef27bae1371bed62a9a3cb