API changes in patchbd95740648(change If667a55b merged from klp-dev) conflicted withaaca5d888a(change I7c22c1ff). Change-Id: I477d088f22aa80fc37a9ac78834bfcb5c11922ca
API changes in patchbd95740648(change If667a55b merged from klp-dev) conflicted withaaca5d888a(change I7c22c1ff). Change-Id: I477d088f22aa80fc37a9ac78834bfcb5c11922ca