Some change due to android update
some changes due to android update