Merge changes from topic "jdi-support" am: 44be23ea22 am: ba06c8c2b0
am: 7fb4b76ba6

Change-Id: I3a18fd97396c609489b5b55a2538a98085fd17fb