Merge 3b1ee19c2b2a7717e7bfac8bfa3a2a082d20e828 on remote branch

Change-Id: I0e6a4273f7408c5edf8e8b6a9d7e3f17b4b4513e