Android l-preview release 2
merge in lmp-preview-dev history after reset to 28b8b2c8a91ea1b119027795dbd2fe666f1bb9ad