Merge 821678e1

Change-Id: Ia6b827e03d8a62c4682e304a4f7f3b839c8cbbc3