merge from open-source master

Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6