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

Change-Id: I1f1a52c0eba153a3980d820d5e258bdb6a3be8b1