merge upstream

Change-Id: Iba2edfe18f39da5edc7d4b437c0e3fe92d97280a