Merge 4c39cb3bdb78683a57e61152547d142eb4c03fd0 on remote branch

Change-Id: I3bd77364507930cfb4da619f7bff445795fe1640