[gwt-contrib] Change in gwt[master]: Remove dependency of RequestFactory on ASM.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Remove dependency of RequestFactory on ASM. .. Patch Set 2: (2 comments) File

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread Goktug Gokdogan
Goktug Gokdogan has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: @Thomas: I don't think it is ideal but also I dont think it would cause any

[gwt-contrib] Change in gwt[master]: Disentangle module dependencies, breaks (most) cyclic depend...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Disentangle module dependencies, breaks (most) cyclic dependencies. .. Patch Set 13: Code-Review+1 LGTM How confident are you about this refactoring

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Remove dependency from GWT-JUnit on deRPC .. Patch Set 2: Code-Review+2 -- To view, visit https://gwt-review.googlesource.com/1290 To unsubscribe, visit

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has submitted this change and it was merged. Change subject: Remove dependency from GWT-JUnit on deRPC .. Remove dependency from GWT-JUnit on deRPC GWT-JUnit never actually used deRPC, which additionally is

[gwt-contrib] Change in gwt[master]: makes GWT boolean flags togglable

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: makes GWT boolean flags togglable .. Patch Set 1: Some of the flag classes (e.g., ArgHandlerNoServerFlag) no longer match the tag name. Should those class

[gwt-contrib] Change in gwt[master]: Adds new configuration property to specify minimum fragment ...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has abandoned this change. Change subject: Adds new configuration property to specify minimum fragment size. .. Abandoned Yep, this was already submitted:

[gwt-contrib] Change in gwt[master]: By default, disable Super Dev Mode on https pages. This shou...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has abandoned this change. Change subject: By default, disable Super Dev Mode on https pages. This should make it safer to leave the Super Dev Mode hook on all the time when the production server uses https.

[gwt-contrib] Change in gwt[master]: Update compliance to JDK1_6 when parsing Java using JDT

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has abandoned this change. Change subject: Update compliance to JDK1_6 when parsing Java using JDT .. Abandoned Oh, looks like Roberto made this same change in upgrading the JDT to 3.8:

[gwt-contrib] Change in gwt[master]: Adds isStandalone to ImageResource so Image can used an Uncl...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Adds isStandalone to ImageResource so Image can used an UnclippedState. .. Patch Set 3: (2 comments) Seems okay to me, though if tests are failing we

[gwt-contrib] Change in gwt[master]: Applying dmenzi's patch to fix issue 7291, which causes Inte...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has abandoned this change. Change subject: Applying dmenzi's patch to fix issue 7291, which causes Integer.parseInt to fail on BlackBerry OS7. .. Abandoned This was submitted:

[gwt-contrib] Change in gwt[master]: Add explicit assertNonNull() statements to JSONTest for clea...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Add explicit assertNonNull() statements to JSONTest for cleaner test failures. .. Patch Set 2: Code-Review+2 -- To view, visit

[gwt-contrib] Change in gwt[master]: Add explicit assertNonNull() statements to JSONTest for clea...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has submitted this change and it was merged. Change subject: Add explicit assertNonNull() statements to JSONTest for cleaner test failures. .. Add explicit assertNonNull() statements to JSONTest for cleaner

[gwt-contrib] Change in gwt[master]: Disentangle module dependencies, breaks (most) cyclic depend...

2013-05-13 Thread Thomas Broyer
Thomas Broyer has posted comments on this change. Change subject: Disentangle module dependencies, breaks (most) cyclic dependencies. .. Patch Set 13: I think we should wait until I complete the modularization, in case I

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread John A. Tamplin
John A. Tamplin has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: JavaScriptException is in the client package and contains JSNI, so it cannot be

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread Goktug Gokdogan
Goktug Gokdogan has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: For this scenarion, I think the class is not loaded in server side so JVM won't

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread Goktug Gokdogan
Goktug Gokdogan has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: FYI, if we are putting a hard rule on this, according to our internal build file

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread John A. Tamplin
John A. Tamplin has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: (1 comment) Yes, I know there are many cases now. But adding more takes us further

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread Goktug Gokdogan
Goktug Gokdogan has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: (1 comment) I think there are 2 misunderstandings: 1. This is not introducing a new

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread Thomas Broyer
Thomas Broyer has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: (1 comment) @Goktug: I was trying to move isClassMetadataAvailable and

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread Goktug Gokdogan
Goktug Gokdogan has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: If it is blocking you, I think it is fine to just drop it (you might need to fix

[gwt-contrib] Change in gwt[master]: Introduces a common SerializableThrowable as public API.

2013-05-13 Thread Thomas Broyer
Thomas Broyer has posted comments on this change. Change subject: Introduces a common SerializableThrowable as public API. .. Patch Set 5: For now I had just commented the lines (effectively dropping the dependency on

[gwt-contrib] Change in gwt[master]: Remove dependency of RequestFactory on ASM.

2013-05-13 Thread Thomas Broyer
Hello Leeroy Jenkins, I'd like you to reexamine a change. Please visit https://gwt-review.googlesource.com/2720 to look at the new patch set (#3). Change subject: Remove dependency of RequestFactory on ASM. .. Remove

[gwt-contrib] Change in gwt[master]: Disentangle module dependencies, breaks (most) cyclic depend...

2013-05-13 Thread Thomas Broyer
Hello John A. Tamplin, Matthew Dempsky, Ray Cromwell, Matthew Dempsky, Leeroy Jenkins, I'd like you to reexamine a change. Please visit https://gwt-review.googlesource.com/1243 to look at the new patch set (#14). Change subject: Disentangle module dependencies, breaks (most) cyclic

[gwt-contrib] Change in gwt[master]: Remove dependency of RequestFactory on ASM.

2013-05-13 Thread Thomas Broyer
Thomas Broyer has posted comments on this change. Change subject: Remove dependency of RequestFactory on ASM. .. Patch Set 2: (2 comments) File

[gwt-contrib] Change in gwt[master]: Remove dependency of RequestFactory on ASM.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Remove dependency of RequestFactory on ASM. .. Patch Set 3: Code-Review+1 -- To view, visit https://gwt-review.googlesource.com/2720 To unsubscribe, visit

[gwt-contrib] Change in gwt[master]: Add SafeUri overloads for setting properties used for naviga...

2013-05-13 Thread Patrick Tucker
Patrick Tucker has posted comments on this change. Change subject: Add SafeUri overloads for setting properties used for navigation .. Patch Set 4: How about adding a constructor for Frame? Currently there is Frame(String

[gwt-contrib] Change in gwt[master]: Fix broken build: s/assertNonNull/assertNotNull/

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has uploaded a new change for review. https://gwt-review.googlesource.com/2730 Change subject: Fix broken build: s/assertNonNull/assertNotNull/ .. Fix broken build: s/assertNonNull/assertNotNull/ Change-Id:

[gwt-contrib] Change in gwt[master]: Fix broken build: s/assertNonNull/assertNotNull/

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Fix broken build: s/assertNonNull/assertNotNull/ .. Patch Set 1: Fixes build breakage caused by previous patch: https://gwt-review.googlesource.com/#/c/1962/

[gwt-contrib] Change in gwt[master]: Fix broken build: s/assertNonNull/assertNotNull/

2013-05-13 Thread Thomas Broyer
Thomas Broyer has posted comments on this change. Change subject: Fix broken build: s/assertNonNull/assertNotNull/ .. Patch Set 1: Code-Review+1 Ha, I wondered if it was just me, or Eclipse really not liking all my branch

[gwt-contrib] Change in gwt[master]: Fix broken build: s/assertNonNull/assertNotNull/

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Fix broken build: s/assertNonNull/assertNotNull/ .. Patch Set 1: Code-Review+2 -- To view, visit https://gwt-review.googlesource.com/2730 To unsubscribe,

[gwt-contrib] Change in gwt[master]: Fix broken build: s/assertNonNull/assertNotNull/

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has submitted this change and it was merged. Change subject: Fix broken build: s/assertNonNull/assertNotNull/ .. Fix broken build: s/assertNonNull/assertNotNull/ Change-Id:

[gwt-contrib] Change in gwt[master]: Remove dependency of RequestFactory on ASM.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Remove dependency of RequestFactory on ASM. .. Patch Set 3: Code-Review+2 -- To view, visit https://gwt-review.googlesource.com/2720 To unsubscribe, visit

[gwt-contrib] Change in gwt[master]: Remove dependency of RequestFactory on ASM.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has submitted this change and it was merged. Change subject: Remove dependency of RequestFactory on ASM. .. Remove dependency of RequestFactory on ASM. This is a follow-up to r11399 which only removed half the

[gwt-contrib] Change in gwt[master]: Adds isStandalone to ImageResource so Image can used an Uncl...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Adds isStandalone to ImageResource so Image can used an UnclippedState. .. Patch Set 3: FYI, the test failures are:

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Remove dependency from GWT-JUnit on deRPC .. Patch Set 2: Hm, this patch is breaking the RPCSuite tests, but I can't quite figure out why. I see these

[gwt-contrib] Change in gwt[master]: Removes api-checker reference JARs from the source tree.

2013-05-13 Thread Matthew Dempsky
Hello Matthew Dempsky, I'd like you to reexamine a rebased change. Please visit https://gwt-review.googlesource.com/2500 to look at the new rebased patch set (#2). Change subject: Removes api-checker reference JARs from the source tree.

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread James Nelson
James Nelson has posted comments on this change. Change subject: Remove dependency from GWT-JUnit on deRPC .. Patch Set 2: RPCSuite is adding a number of deRPC test suites at the bottom of the test. The

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread James Nelson
James Nelson has posted comments on this change. Change subject: Remove dependency from GWT-JUnit on deRPC .. Patch Set 2: Sorry to spam, but the fix would be to trace the test classes extending HybridServiceServlet and

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Remove dependency from GWT-JUnit on deRPC .. Patch Set 2: Unfortunately, the logs aren't very clear to me which methods are failing, but thanks for the

[gwt-contrib] Change in gwt[master]: Removes api-checker reference JARs from the source tree.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Removes api-checker reference JARs from the source tree. .. Patch Set 2: Oh duh, we'll need to add the .jars to GWT_TOOLS first for the presubmit to

[gwt-contrib] Change in gwt[master]: Segment the code generation in loadMethodsJava and loadSigna...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Segment the code generation in loadMethodsJava and loadSignaturesJava .. Patch Set 1: (1 comment)

[gwt-contrib] Change in gwt[master]: Adds filter during fragment extraction to ensure that a give...

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has abandoned this change. Change subject: Adds filter during fragment extraction to ensure that a given fragment computed as exclusive by set complement actually is exclusive by checking it exists within the live from splitpoint set.

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Remove dependency from GWT-JUnit on deRPC .. Patch Set 2: It is definitely the deRPC tests at the bottom of RPCSuite. Commenting them out fixes the test

[gwt-contrib] Change in gwt[master]: Segment the code generation in loadMethodsJava and loadSigna...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Segment the code generation in loadMethodsJava and loadSignaturesJava .. Patch Set 1: Code-Review+1 The patch seems reasonable to me, but I'm not familiar

[gwt-contrib] Change in gwt[master]: Add SafeUri overloads for setting properties used for naviga...

2013-05-13 Thread Goktug Gokdogan
Goktug Gokdogan has posted comments on this change. Change subject: Add SafeUri overloads for setting properties used for navigation .. Patch Set 4: Clearing looks like a pretty common use case for the ugly setXXX((String)

[gwt-contrib] Change in gwt[master]: Segment the code generation in loadMethodsJava and loadSigna...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Segment the code generation in loadMethodsJava and loadSignaturesJava .. Patch Set 2: Code-Review+2 -- To view, visit

[gwt-contrib] Change in gwt[master]: Segment the code generation in loadMethodsJava and loadSigna...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has submitted this change and it was merged. Change subject: Segment the code generation in loadMethodsJava and loadSignaturesJava .. Segment the code generation in loadMethodsJava and loadSignaturesJava

[gwt-contrib] Change in gwt[master]: Remove dependency from GWT-JUnit on deRPC

2013-05-13 Thread James Nelson
James Nelson has posted comments on this change. Change subject: Remove dependency from GWT-JUnit on deRPC .. Patch Set 2: The tests that were commented out simply extend the other tests that run through a normal

[gwt-contrib] Change in gwt[master]: Add SafeUri overloads for setting properties used for naviga...

2013-05-13 Thread Patrick Tucker
Patrick Tucker has posted comments on this change. Change subject: Add SafeUri overloads for setting properties used for navigation .. Patch Set 4: Why not add a null check and set null when appropriate? -- To view, visit

[gwt-contrib] Change in gwt[master]: Add SafeUri overloads for setting properties used for naviga...

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Add SafeUri overloads for setting properties used for navigation .. Patch Set 4: The issue Goktug is referring to is that code like

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has uploaded a new change for review. https://gwt-review.googlesource.com/2701 Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Make sub/superclass queries in JTypeOracle

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has uploaded a new patch set (#2). Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Make sub/superclass queries in JTypeOracle more efficient. Assign a unique id to each class

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has posted comments on this change. Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Patch Set 2: This is the optimization I was talking about. It trims about 15 seconds in

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Patch Set 2: (2 comments) Seems okay, but I'll defer to you compiler guys. :)

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Roberto Lublinerman
Hello Leeroy Jenkins, I'd like you to reexamine a change. Please visit https://gwt-review.googlesource.com/2701 to look at the new patch set (#3). Change subject: Make sub/superclass queries in JTypeOracle more efficient.

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has posted comments on this change. Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Patch Set 2: (2 comments) File

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Patch Set 3: (1 comment) File

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Roberto Lublinerman
Hello Leeroy Jenkins, I'd like you to reexamine a change. Please visit https://gwt-review.googlesource.com/2701 to look at the new patch set (#4). Change subject: Make sub/superclass queries in JTypeOracle more efficient.

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Patch Set 4: Code-Review+1 LGTM for my nits :) -- To view, visit

[gwt-contrib] Change in gwt[master]: Make sub/superclass queries in JTypeOracle more efficient.

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has posted comments on this change. Change subject: Make sub/superclass queries in JTypeOracle more efficient. .. Patch Set 3: (1 comment) File

[gwt-contrib] Change in gwt[master]: makes GWT boolean flags togglable

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has posted comments on this change. Change subject: makes GWT boolean flags togglable .. Patch Set 1: Code-Review+2 (1 comment) File

[gwt-contrib] Change in gwt[master]: Temporarily disable deRPC tests.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has uploaded a new change for review. https://gwt-review.googlesource.com/2733 Change subject: Temporarily disable deRPC tests. .. Temporarily disable deRPC tests. Change-Id:

[gwt-contrib] Change in gwt[master]: Adds two new optional configuration properties to allow the ...

2013-05-13 Thread Roberto Lublinerman
Roberto Lublinerman has abandoned this change. Change subject: Adds two new optional configuration properties to allow the JsNamer passes to exclude a set of predefined symbols or symbol suffixes in the output. This is to enable better integration with closure compiler which has

[gwt-contrib] Change in gwt[master]: Temporarily disable deRPC tests.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has uploaded a new patch set (#2). Change subject: Temporarily disable deRPC tests. .. Temporarily disable deRPC tests. Bug: issue 8136 Change-Id: I6f439cd60d7f08df2c192ecdc5c6312e6aca1f50 --- M

[gwt-contrib] Change in gwt[master]: Temporarily disable deRPC tests.

2013-05-13 Thread James Nelson
James Nelson has posted comments on this change. Change subject: Temporarily disable deRPC tests. .. Patch Set 2: Code-Review+1 Looks good, but after checking out the tests that are disabled, I've noticed the only

[gwt-contrib] Change in gwt[master]: Temporarily disable deRPC tests.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Temporarily disable deRPC tests. .. Patch Set 2: Argh, we have an internal user using hijackLegacyInterface=true... -- To view, visit

[gwt-contrib] Change in gwt[master]: Workaround JSONTest failure in Firefox 17

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has uploaded a new change for review. https://gwt-review.googlesource.com/2734 Change subject: Workaround JSONTest failure in Firefox 17 .. Workaround JSONTest failure in Firefox 17 For some reason, calling

[gwt-contrib] Change in gwt[master]: Workaround JSONTest failure in Firefox 17

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Workaround JSONTest failure in Firefox 17 .. Patch Set 1: This is an ugly hack, but it'll finally allow us to switch our internal testing from Firefox 3.6

[gwt-contrib] Change in gwt[master]: Workaround JSONTest failure in Firefox 17

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has uploaded a new patch set (#2). Change subject: Workaround JSONTest failure in Firefox 17 .. Workaround JSONTest failure in Firefox 17 For some reason, calling JSONValue.isNull() sometimes returns non-null

[gwt-contrib] Change in gwt[master]: Temporarily disable deRPC tests.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has posted comments on this change. Change subject: Temporarily disable deRPC tests. .. Patch Set 2: Code-Review+2 -- To view, visit https://gwt-review.googlesource.com/2733 To unsubscribe, visit

[gwt-contrib] Change in gwt[master]: Temporarily disable deRPC tests.

2013-05-13 Thread Matthew Dempsky
Matthew Dempsky has submitted this change and it was merged. Change subject: Temporarily disable deRPC tests. .. Temporarily disable deRPC tests. Bug: issue 8136 Change-Id: I6f439cd60d7f08df2c192ecdc5c6312e6aca1f50 --- M