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

Change-Id: I4f12897e99b4544c77d0b216b4572e910abeb1df