Resolving merge conflict on rebase
Some large updates for android and jmeter