Merge 426ea360d5c2286263b7445de71491195aede27b on remote branch

Change-Id: I4df1fd03f20eeef52fc681901988622cc9c2054e