more fix

Change-Id: I52f75f8e69c9b1dd780de482e5fe88b84de34030
added javax.naming

Change-Id: I1ee2606ededdccc07d9535ba58b944bfe479c553