Merge "Fix SDK build"
am: 909fab2235

Change-Id: I78288d9488e7de354ed0bee1892745434261816a