Updates to androidL branch