Update w.r.t Android L (preview) release