Merge 37420c3fb7938d26923b18a05ec76da19096edeb on remote branch

Change-Id: I4f48b53c2d4758332ec3758bde18288bee05b7c2