Merge changes from topic "remove-log_to"
am: acd17330df

Change-Id: I910aa933ac8a1393c1bcac56b5cc12c1602c2095