Merge 4adc466895edcbbbc5edb01d869ba6b170bda594 on remote branch

Change-Id: I541f5d57dd337dd2f4ba45eefaa69a407c23fafc