Merge 5e44b789ee872607355eb729da023a056d15d4fd on remote branch

Change-Id: I5c69883f99e6f9498bf003bac3d0884c16cb17e5