Merge 56438736924e3289ffa83651d786939ed6aff723 on remote branch

Change-Id: If7621d7e265f65252e9b39abe395551b15298a14