Merge 34358813276e7f36a5ce18573841c01fc347a63c on remote branch

Change-Id: I445787388b106a6f999b0856af9e209f4efc92bb