Commits
Daniel Sandler authored 6071c3dcf69
Fix build. API changes in patch bd95740648372449a4d5c164d7050eee352d4c24 (change If667a55b merged from klp-dev) conflicted with aaca5d888a0dfdb6f9b7fdb6a6cf34f6a23ef68b (change I7c22c1ff). Change-Id: I477d088f22aa80fc37a9ac78834bfcb5c11922ca