Merge b9039b2006949d8bcab3c4358c3053a43ca92048 on remote branch

Change-Id: I7702a31f1ccc71d8da9463137fca22db52831487