Android l-preview release 2
Merge commit '64af6148cfd55ad55ea491473ed42c168299c94e' into HEAD